bitkeeper revision 1.1159.53.3 (412e695eeFpJoA3teQTvadoyC5gOkQ)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 26 Aug 2004 22:51:10 +0000 (22:51 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 26 Aug 2004 22:51:10 +0000 (22:51 +0000)
commit9d8a9621ca0564bb17f951ddb7cd6974cac5571e
tree323876e9909d8551b0fb14c148993927bc5e21ee
parent87d1602033ee0042db70d5399c79c5c31295d6a3
bitkeeper revision 1.1159.53.3 (412e695eeFpJoA3teQTvadoyC5gOkQ)

Fix broken merge.
.rootkeys
linux-2.6.7-xen-sparse/arch/xen/kernel/gnttab.c [deleted file]
linux-2.6.7-xen-sparse/include/asm-xen/gnttab.h [deleted file]
linux-2.6.8.1-xen-sparse/arch/xen/kernel/gnttab.c [new file with mode: 0644]
linux-2.6.8.1-xen-sparse/include/asm-xen/gnttab.h [new file with mode: 0644]